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

Merge changes from topic "presubmit-am-ba475b17246b4ba3be601f794b9dc05b" into sc-qpr1-dev am: 9e5fe686 am: 58f593e1 am: bbf6ffbb

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

Change-Id: I6b4739b3e3f6dfe167c128fe907484a8be9a7b83