Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into...

Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-dev-plus-aosp am: acd8adf8 am: 394439f5 am: 3be7935e

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

Change-Id: Ibda4adca430f4583b3665ca0bc16650490c5d3f5