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