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