Merge changes from topic "presubmit-am-67b00fe875b44d77afdb1ce083f53101" into sc-mainline-prod am: a8b65842

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

Change-Id: I904032715caeed1f5d8a77f0811078918d772868