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