Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into...

Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-dev-plus-aosp am: c64feab3 am: 6f1207b9 am: 1435145f

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

Change-Id: I6ae2672d130ca9c6e647eadc2cbb65d7fe7268d6