Merge "Add ro.apk_verity.mode to PlatformProperties"
am: dedc5c8a07

Change-Id: I6b155bef7a33b7ec6fd7665ac568e0f53c236610