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

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

Change-Id: I3626d4d05778ef86bd5f6452b009aa0c27a29ec1