Merge changes from topic "tetheroffload-aidl-cherry-pick" into tm-mainline-prod am: d1de52c170

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

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