Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode"...

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f2975 am: d04d501c" into oc-dr1-dev-plus-aosp
am: 1fa1f100

Change-Id: I0f0da929e78146408def47e03ae9f2425849d7e9