Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into...

Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into sc-qpr1-dev am: efafc988

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

Change-Id: I9098b05c336c2488fbfcefe5bf7da78acca4cca4