Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into sc-qpr1-dev am: 20b7fa7d

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

Change-Id: I781c8829753acba634cddd6bf2d639fda5d93c74