Merge changes from topic "am-fadbd2ad8d6246cc86edf16a1b20b4d7" into udc-d1-dev-plus-aosp am: fc287538

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



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