[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am: e7906cb910
am: f7fcdbda29  -s ours

Change-Id: Ie1456f331f0547576ca3e540733e7b0982755700