Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
am: 18e0781d3d

Change-Id: I9a31a0b3c9abc72a619c06c2ffc092d5ef557213