Merge \"Check cell radio flag before enabling APM\" into nyc-mr1-dev
am: 48ed6a0b60

Change-Id: I004219a6cf05fd0d572e0e63648592f71f1e264e