Fix: 264489957 Test: flash and no related avc error Change-Id: Ibf616a98e9341310e18db6dda27d86adbf24deac