Merge "Revert^2 "Use optimized resource shrinking for SystemUI"" into main am: a5f8312b67

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

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