Merge changes from topic "presubmit-am-a4a19a7ff98b4684a251eb77e61ed0b8" into sc-mainline-prod am: fe32532d

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

Change-Id: Ie2d328d26c32b9ea38634419c644cd96c31c3f5d