Merge "Avoid reverting apex on devices that do not support updating apex" into rvc-dev am: d8b6b0fb92

Change-Id: I28a2a568089d1b6a07c6a9cb0f08d99cae9bb335