Merge "Make ACTION_SETTING_RESTORED SystemApi" am: 2e2a97c04b am: d8ef70a405 am: 2f68d6bc5c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945287

Change-Id: I447d2f861e1c05f9483fe60e48e45918c448adfd