Merge "Fix std::unique_ptr error with incomplete CommonFeatureGroup" into aosp-main-future am: 63cfd0e961 am: c51ed80bac

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

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