Merge "Add unit tests for android::compositionengine::impl::planner::CachedSet" into sc-dev