Merge "[Settings] Expose @hide APIs as @SystemApi"