[automerger skipped] Merge "Fix compile error in different build variant" into main am: 2aeec5bd -s ours am: 88910740 -s ours

am skip reason: Merged-In I7195aaca849eb53e603565a470b780ba91b3ec2c with SHA-1 b4d900b1 is already in history

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



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