tree 551a4afe67b01bbe50d536c0edf6f4a2288f1a34
parent c3a1cde372547a69b08516c66f9805de176e71aa
parent e4dd53af2bd64a86e7139b0d0a03a5c6805cfa7d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582658250 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582658250 +0000

Merge "Fix SecurityControllerTest" into rvc-dev am: 6d03d973c0 am: e4dd53af2b

Change-Id: Ib67e191ec962a9261227ff45b60fdf1173291260