Merge "Allow flag-guarded Java optimizations for services" am: 4746631ed1

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

Change-Id: Ifbc5157860b63ecd48a469393f1eb06f9a3852da