Merge "Ignore getService deprecation warning in IServiceManager" am: 71bf41ef5e am: abb6f93847

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2381613

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