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