Merge "Add TEST_MAPPING to android/server/security directory" into rvc-dev am: 837ee8396c

Change-Id: I0d4f4f734f3f208bad7058fe783066fccee2f30f