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

Bug: 191673756
Test: ./gradlew bOS
Change-Id: Ie8dab3ab5e6a5cd3fb78d211acc213430a101ef5
13 files changed