[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: 5454d1ae -s ours am: d5ff238f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibe787dc9eda0a1257787c8b33b395e30c7b092da