Merge changes from topic "presubmit-am-6e2d2013d117441baf471cd8f74a86ef" into sc-qpr1-dev am: 33503d59

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

Change-Id: Ib5ef9920b622d029d80d22289e668db6459a6860