FP2-1667: Sync extras bundle comparison can throw NPE

Sync extras bundle comparison can throw NPE

BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)
(cherry picked from commit c0f39c1ece72a05c796f7ba30b7a2b5b580d5025)
3 files changed