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

Change-Id: Ia1fabd4b306f9af5fd0d9f37d7c2f051fc055da6