Merge "Add a switch to enforce avb for DSU in userdebug"