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