Merge "Add TEST_MAPPING to android/server/security directory" into rvc-dev am: 837ee839 am: e213a501 Change-Id: Ib36c7b15da868d986e648a822f206b9c3774bb4e