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