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