Merge changes from topic "presubmit-am-0550843f1444420ab16f47a7d2ecee97" into sc-qpr1-dev am: 89a07b5a am: fd04a457

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

Change-Id: I34f5dbdb1fcc6d3ebe9fda0b634134295ac618da