Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd4 am: b3d5341c

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

Change-Id: I012ce05d574bd68d911853ef059e96d3f284b396