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