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