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

Change-Id: Iadd3ec32e21e0c6bcf716be854121a5125532b2f