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