Merge "Enhance recent sync log in dumpsys content" into oc-dr1-dev
am: a014ce292a

Change-Id: I37135899d96cbd0eed2df224aef061d1f02857ec