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