am 5f474fcb: Merge "Edge case: overriden system package moved & became...
am 5f474fcb: Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev
* commit '5f474fcb':
Edge case: overriden system package moved & became privileged in OTA