Merge changes I64ce898e,I6d21792f,Ib977ea97,I006eddb0 into sc-qpr1-dev am: 66c8b26209 am: 61a041eb7f

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

Change-Id: I8c5e29b3352e291a321947b41fe748b9198c2b60