Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev