Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" into sc-qpr1-dev am: afb2230e am: 38c0dec5 am: 5d88a03f

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

Change-Id: I7580b1a6eb737cdc23618ab86fe41501e2a90229