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

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

Change-Id: I884644f97f9c595e695f6e00acdcaad4326500b3