Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" into sc-qpr1-dev am: afb2230ede am: 38c0dec502

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

Change-Id: I4e81728ab82031788ebf9ec0bc166db722aa4221