[automerger skipped] Merge changes from topic "am-fddb9f6b1bb3410b8937e76c149bc556" into udc-d1-dev-plus-aosp am: d9efd356 -s ours am: f5dde7f0 -s ours

am skip reason: Merged-In I01c46cd868abd3e91fa37d80f5b75aec4b9f0014 with SHA-1 28227a3e is already in history

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



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