Merge "Fix appops TEST_MAPPING." into rvc-dev am: aa795a68a1

Change-Id: I646be6a6ac8c5141b8033482ddf60cbfd504daed