Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc am: 8c0d308276

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923

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