Merge "TEST_MAPPING: re-enable ScanningSettingsTest in presubmit" into main am: 7171819017

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

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