Merge changes from topics "277240050", "277240050_2" into udc-dev am: fcf2d49b

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



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