Make aosp-main _mostly_ in sync with goog/main

Flag: EXEMPT host test change only
Bug: 292141694
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh -s
Merged-in: Ie9c5deb25ec5f8594feac15b2a3f41b40a65e4f0
Change-Id: Ib037e5a6ae9880c7cbc7d21033ac3124f1a95075
4 files changed