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