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 am: 4a092f85

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



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