Merge "Merge "Add AIDL version check for injectNiSuplMessageData()" into...

Merge "Merge "Add AIDL version check for injectNiSuplMessageData()" into udc-dev am: 4e471917" into udc-mainline-prod am: 1ad30db1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22345624



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