Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I274765b51f942562dbe5683c9339866a0f55d13f