Merge changes from topic "presubmit-am-8fe06d94db0b4326ab412885caecafc6" into sc-v2-dev-plus-aosp am: 175aa192

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

Change-Id: Id6dbe081ffbe66cefe4a8856bd5ba8fd480bdfc1