[automerger skipped] [DO NOT MERGE] Add aosp config for winscope am: c49c2698ec am: 9022debf69 am: a0e5d94a68 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaef60bb85876e44d9a471e0c44e1d4ebf7331656