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

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

Change-Id: I9b11d89e59bcc4961c3d06b7750dd71e13e207dc