Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219559 Change-Id: I657072269483725ca7ebe6a1c6ce82abe24631f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>