Merge "[automerge] DO NOT MERGE Remove DisplayFeature from common package. 2p: 88290180" into sc-v2-dev-plus-aosp