Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into...

Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into sc-mainline-prod am: c68a5284

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

Change-Id: Icf69c7f8255ee49a47073752d85de787b42b48d7