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