Merge changes from topics "presubmit-am-848876f4083644ad802120cf11b761de", "presubmit-am-feedd56083be48668fea14c29cf72287" into sc-v2-dev am: e534d926

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

Change-Id: I89b1975523071461bed3f91a308f44ffdc106bc3