Merge "Make os_version optional for StrongBox" am: fc3fdf1a96 am: be60ee6543

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1971121

Change-Id: I40392ccf660f50ad88ccdd436bf0b992b9af9875