Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am: 18e0781d3d
am: e6faa759d6

Change-Id: Ib0c090a9b54086fa1f0dcac9380584365fa59ed2