Merge changes from topic "b269533590" into udc-dev am: 36fef761f1 am: 09f8a31930

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

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