Merge "Add CTS test for staged APEX rollback" into qt-dev
am: 631b29fbd8

Change-Id: I7efb8cca34c28d25b51a1f0cf28904f2bb09bf09