Merge "Allow getPsdsExtension to return nullptr" into stage-aosp-sc-ts-dev am: a5a3c1ece1 am: f95af27db6 am: 9257580660 am: bc8164f29a

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

Change-Id: I5b43e6941fc87eaf0cf0337043318cdc8262c342