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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21994559



Change-Id: Iedbd2ebe8bc2f98095abb77f7121c1a9fe007e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>