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

Merge changes from topic "presubmit-am-6eadec9a2c354a219e02a4e47c429cd1" into sc-dev am: 82c4e19e am: dfe77803

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

Change-Id: I05e363ddd9e6be359b32ac6cf6c7f80569e166df