Merge "Avoid reverting apex on devices that do not support updating apex" into...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11367727

Change-Id: Ia0c7486d78246f5ef31f115daddb2af9917c793f