Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into sc-v2-dev-plus-aosp am: 5f634bf4 am: d8014c85

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

Change-Id: I798b2139979bd56bc542a0907f1f6b2eeb362878