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