Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811 am: 262b278197
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414 Change-Id: I8b202d20247dfcf652644101a22df8a10e0d84ee
This commit is contained in: