[automerger skipped] Merge "Fix deprecation errors in EasterEgg." into main am: d5a26b17 am: 91e57715 -s ours

am skip reason: Merged-In I8d1c4d299af5621ea27161f5015ab9526332ea39 with SHA-1 94f420ed is already in history

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



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