Merge changes from topic "presubmit-am-62c24e32cf454b58991df46fc5f21f70" into...

Merge changes from topic "presubmit-am-62c24e32cf454b58991df46fc5f21f70" into sc-qpr1-dev am: a3d7354a am: 78c60217 am: 47723587

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

Change-Id: Ic1d54254129b3e67f120db33766cd48076eefd7c