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 d2e82231cd7cd66659a59667eab2dce992dbce66 on remote branch

Change-Id: Ia39fb9b70f8759657c8ddad47ddcaa771194e1ee
Merge "Merge d2e82231cd7cd66659a59667eab2dce992dbce66 on remote branch"