am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop

* commit '5bb4c94a175938dff8178d781a3a839cbdc142b1':
  Don't remove content URI shortcuts during restore