Merge changes from topic "cherrypick-all_rollbacks-f6fjt3va46" into udc-dev am: e6951621

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



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