Merge "Make ACTION_SETTING_RESTORED SystemApi" am: 2e2a97c04b

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

Change-Id: I118e03bf063d1d2d70c9a2feabbcfb4db6872dea