Merge changes from topic "adjust-only-avb" into udc-dev am: 457e90a4 am:...

Merge changes from topic "adjust-only-avb" into udc-dev am: 457e90a4 am: 2a81c3df am: 879efd89

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22959902



Change-Id: I2aea901c37db3e17c2f10829f20c305e88ea2e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>