Merge "packages/apps/KeyChain: Set LOCAL_SDK_VERSION where possible."