Merge changes from topic "EnableAirplaneModeInSafeMode"
am: f0f0606365

Change-Id: I0ffdd11c0e6bc44d94e6b4f067a0ed74e6f75a92