Merge "[automerger skipped] Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am: 18e0781d3d am: e6faa759d6 am: c640787c11 -s ours am skip reason: change_id I878a628824e2eeb639ec5678b1a5d3d10428a918 with SHA1 13f98ce5aa is in history"