Do not attempt out of range shift. am: e34fab41d6 am: 46ab3fa1ce am: 8fbe333540
Do not attempt out of range shift. am: e34fab41d6 am: 46ab3fa1ce am: 8fbe333540

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72c496d91bc5e863295bf97baf2af7c6bccbd66b

google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto