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

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

Change-Id: If38e65092b33cc1e62cf3d4e2f5f5e2e69bb3a8c