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