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