Merge changes I0fc3b7ae,I712e6d6b into sc-qpr1-dev am: 2f0616bd79 am: 5ff3a6c538

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

Change-Id: Iba0fce68cd53dee09bb40af585b6740f7c832beb