Merge "Merge "Fix SecurityControllerTest" into rvc-dev am: 6d03d973 am: e4dd53af" into rvc-d1-dev-plus-aosp