[automerger skipped] Merge "Don't assume an A/B device when overriding the...
[automerger skipped] Merge "Don't assume an A/B device when overriding the super partition name." into qt-dev
am: b10d1ac1 -s ours
am skip reason: change_id I1ea309d448866a8914f58be98d860eca36d47062 with SHA1 0b0ee7af is in history
Change-Id: Ib0a916ec9daa9a6b8d1b0ddd58a1645c075bb790