Merge changes I44ba0f9a,I70afa777 into sc-dev am: bb93c00164

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

Change-Id: I5d8cd7d5533b02f268b23fbe91033caf3344589f