Merge changes from topic "am-98e92ea1e60d42c4abf8179e5406a73b" into udc-dev am: fddd8e8a am: 7ddaea40

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



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