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