Merge changes from topic "presubmit-am-915de06fcef24c52a4175203ce6600eb" into...

Merge changes from topic "presubmit-am-915de06fcef24c52a4175203ce6600eb" into tm-mainline-prod am: 28de1cd7

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



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