Merge "Restrict optional system_server optimizations to shrinking" am: 478baf2287 am: 62e8d5d941

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

Change-Id: Iea92e8a6ca9601926d1c69f0207eae5fc903c69b