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