Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-qpr1-dev am: f16b6c83 am: 86c397d1 am: 03c2d938

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

Change-Id: I2b4959d72ad89377d2ad8482f17b42c5c3bdae4f