Merge changes from topic "presubmit-am-5b9f2922fa9546d3a2b12257b37cc383" into sc-v2-dev-plus-aosp am: 8c495e75

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

Change-Id: I05f8818ddbef404b81af48d3a897968c4346e004