96529876e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648069 Change-Id: Ic60a0a502de6297278e253547321d782026564c5