Merge changes I02898d24,I3b8d172b into sc-dev am: 8fa96139d5 am: b16ae2eb53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350821 Change-Id: I895c9062b2ef51c3cc953317d6bea14a43a2f81a
This commit is contained in: