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

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

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



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