Merge "TEST_MAPPING: enable SettingsTests" am: d1d75b1a9d

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

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