Merge "atrace: Remove funcgraphFlatPath option" am: 63674d5969 am: 423956f26a am: e4005ba97c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1683725

Change-Id: I9175323d7573e79fab031f306c3f8c839321d97f