Merge "Allow CreateResizeDeleteLP test case to run on non-A/B devices" am:...
Merge "Allow CreateResizeDeleteLP test case to run on non-A/B devices" am: 3afe5f22 am: 62fc6c9e am: c3b70a9b
am: 78740e2c
Change-Id: I5b4130695adf6dbaff2ee29c5d2a330bb206452b