Merge "TEST_MAPPING com.android.server.pm.User*"