[automerger skipped] [RESTRICT AUTOMERGE] Fix std::unique_ptr error with incomplete CommonFeatureGroup am: c3e3293549 -s ours

am skip reason: subject contains skip directive

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

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