Merge changes from topic "presubmit-am-a54ccbec81cc4ce89905e012539f525f" into sc-qpr1-dev am: f6f4eb4f7e

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

Change-Id: Ibc2a89d5263bf1f4e708351201e1089c3562aacb