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