Merge "Allow CreateResizeDeleteLP test case to run on non-A/B devices" into qt-dev
am: 2c4803838e

Change-Id: Ie24284987a4423a67e2e26bd8095e96a428761e3