Merge "Allow ComponentKey creation from its string representation am: a4c563c8cc am: 9992964b29" into rvc-d1-dev-plus-aosp am: 0f60644ee0 am: 1b8d9a7cff

Change-Id: Ie508645743b798b73fadcb4a951d94a27b8f7e56