Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758091



Change-Id: I83e7c388bb544170c1a5bee1c31b9ef88c29a465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>