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