[automerger skipped] Add onExpirationUpdate and onKeyStatusChange listeners. am: 439774e7ca am: 2d1326aa99
am: 6dd6a45ee1 -s ours
am skip reason: change_id Ie15e3012a4068824f72371a66e9fca2ee27180f8 with SHA1 ad02cc6c40 is in history

Change-Id: Ie260a474ab5e13b1269c2567ecf5cd09524c71e6