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