[automerger skipped] Merge "[automerge] DO NOT MERGE Remove DisplayFeature...

[automerger skipped] Merge "[automerge] DO NOT MERGE Remove DisplayFeature from common package. 2p: 88290180" into sc-v2-dev-plus-aosp am: 4afd9667 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373396

Change-Id: Id92a8f0fde6ac4694cff5cdd576d84b18def1731