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

Change-Id: I3c49aad4437185b448806d597276d3454ca5da46