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

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

Change-Id: I3bafe3ee8a1d4a34cd8bba21c4eaf2c41f95d278