Merge "Add a switch to enforce avb for DSU in userdebug" am: cd8b982e40 am: cb7854556d

Change-Id: I821f1932b53bdd9b5da5974fea785ba3ffd06501