Merge "Merge "Updated aidl doc w/ regard to lockout." into udc-dev am: 4803c70715" into udc-d1-dev