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