[automerger skipped] Merge "Hide SettingsSlice provider" into pi-dev am: 041bfbd2b6

am: e48cf70a96  -s ours

Change-Id: Ibac67440b71883a94d9e008d2cbf395c5b9a2a2e
This commit is contained in:
Matthew Fritze
2018-08-16 20:07:46 -07:00
committed by android-build-merger

Diff Content Not Available