Settings: Add bridge to PerformanceControl (Test)
Conflicts:
	Android.mk

Change-Id: Ice17917b991532e5c536be0b8cefe9bd9518c3ae
ChangeId: Ib731a869a092b7af70f704ffb600345c4b5f1209