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

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

Change-Id: I8aa17720fff29af125c80333395d4cb4f4ca2c95