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

Change-Id: I81e2e2dc8ee22eed1de327efd2135be70fdfe1bc