[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix std::unique_ptr error...

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

am skip reason: subject contains skip directive

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



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