Merge changes from topic "presubmit-am-0550843f1444420ab16f47a7d2ecee97" into sc-qpr1-dev am: 89a07b5a am: 8e7baf33 am: 814af0dc

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

Change-Id: I4c3000d5419af6afa1e0aac8e58b51857b3e6037