Merge changes from topic "presubmit-am-a54ccbec81cc4ce89905e012539f525f" into...

Merge changes from topic "presubmit-am-a54ccbec81cc4ce89905e012539f525f" into sc-qpr1-dev am: f6f4eb4f am: af6133cd am: ecc7641f

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

Change-Id: I5857881569c2246821f4ae9dba20f5b0d49d3542