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