Merge changes from topic "am-a1464e9329354338abae003b908e7c86" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Remove gson depdency from SystemUISharedLib" into tm-qpr-dev am: b6adbfc68e -s ours
  [automerger skipped] Remove gson depdency from SystemUISharedLib am: 88e4f7a80d -s ours