Merge "Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev...
Merge "Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7 am: 91c540c2 am: cf3564b1" into rvc-qpr-dev-plus-aosp am: 093fd996
Change-Id: I995e13a02c91145eb36533448c397b946b8e232c