Merge "Don't reuse CID while Android is up" am: 9653ec5c66

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1827499

Change-Id: I67697a0b867cc69695b53976c1bb9d5c95be1e0a