Merge "Fix a ServiceNotFoundException in getDisplay." into android15-tests-dev