Merge changes from topic "am-78f401ebe7974e41af578105c020102a" into...

Merge changes from topic "am-78f401ebe7974e41af578105c020102a" into udc-d1-dev-plus-aosp am: f72516b9

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



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