Merge "[Settings] Expose @hide APIs as @SystemApi" am: 3091498e78 am: 8811b44dd1

Change-Id: I1fc3ce179ae0921d258624b968e5fd532386530c