Merge "Allow CreateResizeDeleteLP test case to run on non-A/B devices"
am: 3afe5f22b3

Change-Id: Ief9cd9a63b946964b95bd4177fb4981edaef0e57