[automerger skipped] Merge "Fix std::unique_ptr error with incomplete...

[automerger skipped] Merge "Fix std::unique_ptr error with incomplete CommonFeatureGroup" into aosp-main-future am: 63cfd0e9 am: c51ed80b am: 190fefc8 am: 2f766474 -s ours

am skip reason: Merged-In I9ab51f29724fded24773344aa36763ffeea02d00 with SHA-1 42d2e51b is already in history

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



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