Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546 am: d04d501ce7" into oc-dr1-dev-plus-aosp