Merge changes from topic "am-274f73f9ac3a4427bb6673b88b72667d" into tm-d1-dev-plus-aosp am: 93b91406

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



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