Merge changes from topic "presubmit-am-f6a213faf9b84559abf084f450185dfc" into sc-v2-dev-plus-aosp am: 262d042c50

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

Change-Id: Ie1d7668f1189829ff6058511575ff1584aa48cb2