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

Change-Id: I7f875d47a27c4e97f56fd66e3a7421ba466c19e4