[automerger skipped] [automerge] DO NOT MERGE Remove DisplayFeature from...

[automerger skipped] [automerge] DO NOT MERGE Remove DisplayFeature from common package. 2p: 88290180 am: 09240125 -s ours am: 30bfec0e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idce2ab1e9382663683240d7f567ac8fafbcd14ea