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