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