Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into...

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

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

Change-Id: I83e6f2a4c8769fbc3d0ff7080e2a3e0209c96aa2