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



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