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