Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev