Merge "Add Intentfilter BasePreferenceController" into pi-dev
am: e7906cb910

Change-Id: I4205a88200dcb02ba9029721618da790cb562ea0