Merge changes I02898d24,I3b8d172b into sc-dev am: 8fa96139d5 am: a7cd696a1a

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

Change-Id: I053133f8007d000ffe9ba4253d4789184bb0be33