Merge "TEST_MAPPING: enable SettingsTests" am: d1d75b1a9d am: 2a06f103c5

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

Change-Id: Ic87e130ad477731d90449b641cc07b4a5b0d3018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>