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