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