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

Change-Id: I1d921c74efdc697a2a58b0ac164ac44601e87257