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 am: 2e45e791

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



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