Merge changes I8ca03eb4,Iccd924ca into sc-dev am: f2446930e0 am: c3d7c82b54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15475533 Change-Id: I4fa04f03b7ddb6a164c1b8d57a5a9630fd44b208
This commit is contained in: