Merge "Add TEST_MAPPING for com.android.server.display" into tm-dev