Merge \\\\"Support wiping userdata for A/B OTA packages.\\\\" am: b727d5bb32 am: 4f2b227fae am: 7e5205f929
am: 2d126ab2a4

Change-Id: I55b4787f702ded9c6378e3a4240991de1d336386