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