Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into...

Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into sc-dev-plus-aosp am: c6a20512 am: 2e24be17 am: 46101f29

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

Change-Id: Ie34a3fb9ea01488f7cfe9dde27c92464282accc6