Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd4 am: 2dc67413 am: 81360b89

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

Change-Id: I0ac8950f1d4336f3845f18a5618dfaf592c3d7c0