Merge "Allow getPsdsExtension to return nullptr" into stage-aosp-sc-ts-dev