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