Merge "Add a resource config to define a default supervision component." into qt-dev
am: 7446be3f7d

Change-Id: I052781ce1f86eb3d5a70f8fda5390de1bbbe36f1