Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into...

Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into sc-mainline-prod am: 4bc14211

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

Change-Id: I404d16c81c2373434bee012b8a6d37dc11f522ac