[automerger skipped] Merge "Allow CreateResizeDeleteLP test case to run on non-A/B devices" into qt-dev
am: 2c4803838e -s ours
am skip reason: change_id Ic7c2b246b7c5646d3589f8f57eceb9ba5feeef2b with SHA1 f81bd17179 is in history

Change-Id: Ie12b91f6b2749ea1938310e0b2b7d4d1c22acdbf