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

Merge "Cleanup and consistency around system server profiling." am: 6cbc807a am: e60487c7 am: 40b18ebd

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



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