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