Merge "Enable shrinking for EasterEgg" am: f760323d10 am: 7eda1221b9 am: a4b5b1ed66

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

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