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

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

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