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

Change-Id: I9c33e1ef11ffc18ce3c163d71f701367d6253ed4