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