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

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

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