Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev
am: 1e1d5b07a6

Change-Id: I47b86760bab79c447cfbe23ad163e8864da05eb1