Merge "Mark IDisplayService as deprecated." am: 4c57537e73 am: 8a6dc3976c am: 59a742c237

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

Change-Id: I43b5c7228380fd09e0034c7c0685a05a8ae10080