Merge "Show PLMN on CryptKeeper" into nyc-mr1-dev
am: c3fddb984c

Change-Id: Ibf53419b03256edbcd24805151474a14caac4e38