Merge "Don't mark odsign as oneshot." into sc-dev am: 301d13c4ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15393113

Change-Id: Ic65e1d89fa60d2e4fa9d753f422be8c4c9d82862