Merge "Fix a serialization issue in sync op reporting" into sc-dev am:...

Merge "Fix a serialization issue in sync op reporting" into sc-dev am: 6a483f4f am: aa082f29 am: 5a086e06

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457952

Change-Id: If097676e4d47ec1cea976feb61c30ceef5a1f0f5