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