Merge changes from topic "presubmit-am-6eb6cc390f284836ade6930c3dc57a3a" into...

Merge changes from topic "presubmit-am-6eb6cc390f284836ade6930c3dc57a3a" into sc-mainline-prod am: ca34a777

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

Change-Id: Ie549f660a7f5c903159e8d4e812b2ec589f3fe4e