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

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

Change-Id: I1a55e64bb159cba99d05e577f7e11bcc5250684a