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

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

Change-Id: Idb5d35c2d2f4d0a9b64ae9fbcb823924c712cc10