Merge "Skip upgrade keys for adopted storage" into mnc-dev