Merge changes from topic "presubmit-am-67b00fe875b44d77afdb1ce083f53101" into sc-qpr1-dev am: fcaa1f8e am: 152c6673

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

Change-Id: Ib8c7139d58fded7b2f2ee4bf734461d565f42247