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

Change-Id: I45bcec319da037c043390676ba8683e5b77fe78a