Merge "Show warning when enabling airplane mode in ECM." into pi-dev
am: 74881c2021

Change-Id: I51c7ef7fb4948500ae1ec5a93dc1b3a6f0c93e49