Merge changes from topic "presubmit-am-344b69221da94b53953e04620bfe4930" into...

Merge changes from topic "presubmit-am-344b69221da94b53953e04620bfe4930" into sc-qpr1-dev am: 0cfb14e5 am: 61142479

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

Change-Id: I9bb86f196712c280fef173416d5d55afcdec230c