Merge "Add a lock around any public methods in the AidlCallbackHandler." into udc-dev