24a9b5cad6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621 Change-Id: I641df2f25ba989af597952a03488c817c82323c2