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: 44ad3a21

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



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