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