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

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

Change-Id: I9eec3689df6987b03cbf33d83efe1e69640c8f10