[automerger skipped] Merge changes from topic "cherrypick-all_rollbacks-f6fjt3va46" into udc-dev am: e6951621 am: 719dd939 -s ours

am skip reason: Merged-In I7f77a77ec7935a6327bb758c3398f35389facaf2 with SHA-1 f25aeda0 is already in history

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



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