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