Merge "Generating missing permission state inside restorePermissionState()." into rvc-dev am: e0f524be6f

Change-Id: I49d9c26bafedd7d0b9eb72cfce641a6fb85b00c6