Merge changes from topic "presubmit-am-3c10be889d714dfab534958ebea00946" into sc-v2-dev-plus-aosp am: 59e95f1ba5

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

Change-Id: I3859d86b604e919ed77a44904bd96b8f6a2c255b