Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 am: 6843da1aa8" into nyc-mr1-dev-plus-aosp
am: 2cffcf29ce
* commit '2cffcf29ce961c603543959d1ead423cb260d296':
Change-Id: I22cb6b1d5f1727433d2d10a3e34cb1df1d63fa02
This commit is contained in: