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