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

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

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