[automerger skipped] Merge "Camera: skip unnecessary reconfig" am: b9e732b490 am: f694dc1b4a am: e1655e5469
am: 398fd50891  -s ours

Change-Id: Idcd1e9b118f7871aea9a608d4d5ce06a6e4569ab