[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix std::unique_ptr error with incomplete CommonFeatureGroup" into main am: fc08c2d036 -s ours

am skip reason: subject contains skip directive

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

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