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

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

Change-Id: I0444fccfbeeb669281653bb53b0c68d393f03fdf