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