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

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



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