Merge "Updated aidl doc w/ regard to lockout." into udc-dev