Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into 191673756_upstream_platform

Bug: 191673756
Test: ./gradlew bOS
Change-Id: Icc74c0fb520e24c69bfa861ce969d14bb05e00fc