Merge changes from topic "presubmit-am-616d8c1027a84e8c80568b9c71425b35" into...

Merge changes from topic "presubmit-am-616d8c1027a84e8c80568b9c71425b35" into tm-mainline-prod am: b1116d3d

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



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