Merge "Allow profiling for standalone system server jars." am: bda789c6 am: 8ac01a28

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



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