Merge changes I8ca03eb4,Iccd924ca into sc-dev am: f2446930e0

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

Change-Id: I9f11d1672b98f47b4ebae68d9e2380ca570dafbd