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