Merge changes I566dfa75,Id0d372cf,Ifb79e402,Ic80ed7f8,I40ff3ed0 into sc-qpr1-dev am: e454d516ec am: 93adf08354

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

Change-Id: Iefb488cbbbaaa795109e6229d384404776d81e3e