Merge changes from topic "presubmit-am-6eb6cc390f284836ade6930c3dc57a3a" into sc-dev-plus-aosp am: faa99892 am: fa9781c4 am: 299b5bef

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

Change-Id: I17ed0f3f45e870b2b15d840d27498b2d37ff2676