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

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

Change-Id: I0469f0c4ee12cd5598eb40b90b87c78cbab1c893