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