Merge "Add mInterfaceLock back to Camera3Device methods called by RequestThread." am: e4f1dbca67

Change-Id: Ie5a94dd945642b9c41230c686c640faef6e9ff84