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

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

Change-Id: Ifcc78442d7e7165a49e33d438b386f6fad86409e