Merge "Remove shortcuts update job when experiment is disabled." into ub-contactsdialer-g-dev
am: 78215d5fe1

Change-Id: I3dd105815fc4e5f21ed6fee5509499b1b7a35679