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