Add onExpirationUpdate and onKeyStatusChange listeners. am: 439774e7ca
am: 2d1326aa99

Change-Id: Ifac9b52e62f4b0ed691e0947898f3b2203c30461