Merge "TEST_MAPPING += VINTF tests" into main am: 2b5f3d7808 am: 3b8b033461

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

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