Merge "Merge "Only auto create guests when device is provisioned" into sc-dev am: 683ecb0a am: 56fce580" into sc-v2-dev-plus-aosp