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