[automerger skipped] [RESTRICT AUTOMERGE] Fix std::unique_ptr error with incomplete CommonFeatureGroup am: c3e32935 -s ours am: 6c9b3c44 -s ours am: b46c6004 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I66f59633ca2737053411347d8915ac18ae5d3d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>