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