Merge \"Remove tied profile encryption key cache in keystore\" into nyc-mr1-dev
am: 3ed2a52bb1

Change-Id: I127bb8329b374e57147b42f13f699b3125872367