Merge "[Composer-HAL-AIDL] Deprecates getDisplayAttribute" into main