Merge "TEST_MAPPING: add vts core lib tests" am: aaa402ae6a am: 3960126eb1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2381872

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