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