am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit '706c985f0a8c8d996b979543a541ed2cb41269e1':
  Deactivate the backup agent in Camera2