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