Merge changes from topic "am-5a8427cd0d69431bbf06323340258192" into tm-dev am: e0363130

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



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