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