Merge "profilers: CanProfileAndroid nit fixups" am: 9a5292362f am: 4717c8625d am: b36b79dca5 am: 8a66f2a341 am: fd9c9eaa1f

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/2063856

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