Merge changes from topic "presubmit-am-bceb8e4e168541e88503e0f69150fe98" into...

Merge changes from topic "presubmit-am-bceb8e4e168541e88503e0f69150fe98" into tm-dev am: bf850d65 am: a099eb5f

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



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