Merge changes Ibd9f22af,Id42f5276 into sc-qpr1-dev am: e1841dc539 am: 84afe777a1 am: 6fc6456e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897408 Change-Id: Ife8b0ef9b79c666200b6217178fb74b91944a7cc
This commit is contained in: