Merge "GCC: fix ambiguous call to make_optional" am: 765c0f8ed1

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

Change-Id: I51fd99611d59af226a444e6986ae76dc8ad1d70d