Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662359 Change-Id: Ie78388de67343e7a6c931c0419d237f13a6d6cf8