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

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

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