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