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