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