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