Merge "Cleanup and consistency around system server profiling." am: 6cbc807a6f

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

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