[automerger skipped] Merge "Add mInterfaceLock back to Camera3Device methods...
[automerger skipped] Merge "Add mInterfaceLock back to Camera3Device methods called by RequestThread." am: e4f1dbca am: acff0376 -s ours
am skip reason: Change-Id I384f62bc9936d9691dfe9c13ff743e3d07f2ed55 with SHA-1 646c31b0 is in history
Change-Id: Id58777482fc8d6898d845da406cb8efd28272006