Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-qpr1-dev am: 33d52c3daf

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

Change-Id: I3765e09397c76afd5fe382391f856b8b4e457c98