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