Merge changes I0fc3b7ae,I712e6d6b into sc-qpr1-dev am: 2f0616bd79 am: 5ff3a6c538 am: bdde424fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15795789 Change-Id: I31fcdc85f9f551c4f23b3bed74c99048fbce248b
This commit is contained in: