Merge "Add TEST_MAPPING to android/server/security directory" into rvc-dev