Merge changes from topic "presubmit-am-a0f887f302784f8c86331d3e0819fa21" into sc-qpr1-dev am: 82e2fcfd

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

Change-Id: I028e5371e5236f665affb5dc34b9ea49ded56509