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

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

Change-Id: Ieb351f2f98070b02e7ba7edf0db52578f02a55b6