[automerger skipped] Merge "Adding KEY_PERMANENTLY_INVALIDATED to ResponseCode" am: 3e9cd87e48 am: d0749a339a
am: dc4c059c60 -s ours
am skip reason: change_id I188948e6e2e66903ee259108db9b8d26d11ca92c with SHA1 624cf843b5 is in history

Change-Id: I7a947d0cf484d6dbcd9411295c0a7897b3791a32