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