Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71