QCamera2: Fix for SW based encryption

In encryption mode, camera daemon will start later on.
And mediaserver is trying to get number of camera.
And hangs there because camera daemon is not there

Change-Id: I2aff7236794ad48434d64660e5a794db025015b7
Merge "QCamera2: Fix for SW based encryption"
Merge de635b84e793c388754bbe1738f781b458bc6684 on remote branch

Change-Id: Icf86ff06ce152089b926108f9c9b15aa84005b5f
Merge "Merge de635b84e793c388754bbe1738f781b458bc6684 on remote branch"