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