Merge changes from topic "presubmit-am-1d523cc92d6b483ea6b09ce7e530d2fb" into...

Merge changes from topic "presubmit-am-1d523cc92d6b483ea6b09ce7e530d2fb" into tm-mainline-prod am: 5027ebd6

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

Change-Id: Id3d3bc39c674e9197deb8b1e7825090dc40a8d31