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