Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into sc-qpr1-dev am: d4d7eb43cd

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

Change-Id: I0944ad5b0de81f8244f8a054105de0cfd1bd777e