Merge "src_frameworkcommon: Fix filegroup base path am: 97c7286f69 am: 7c58cb5043" into rvc-d1-dev-plus-aosp