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