am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit 'bda9b324c88b70514109f2d9ffc937ca3202fd03':
  Change default cellular activity timeout to 10