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: 3b4848a6 am: 3f0e9c70

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



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