Merge changes from topic "presubmit-am-67b00fe875b44d77afdb1ce083f53101" into sc-dev-plus-aosp am: fcaeb0f6 am: f43afa5b am: 949cbab0

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

Change-Id: I1f76023d15c21b596765214311de4d1880c753bc