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

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

Change-Id: I9a361feae3bf46ecb1b3639e1c84a5d677f94ff7