Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f am: 7c15aa4254

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

Change-Id: I222e33a7e88f0301f2b357197d34bddd95132d19