Merge "Remove usage of persist.apexd.verity_on_system"