b701ce8b68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727620 Change-Id: If4a883d96290adadc228526ec5e2518c8e566cf0