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

Merge changes from topic "presubmit-am-b36d3cf7498841d4a684ea497f8526c1" into tm-mainline-prod am: 15a00283

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



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