Merge changes from topic "presubmit-am-3e6ab1dc1c14473f852ccb484c65ce15" into sc-dev-plus-aosp am: ed90561d am: 394bdd23

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

Change-Id: I39747c92fb62a543b9eff883b38e2497d0dbba66