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