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

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

Change-Id: Ib268a21c6b06400e98400a86e0ae459de4a82603