Merge "Merge "Fix SecurityControllerTest" into rvc-dev am: 6d03d973 am: e4dd53af" into rvc-d1-dev-plus-aosp am: 3263bea9 Change-Id: I884984fb1fd60cc3d88a59b2f4aab6f9513ad2e3