am 86c41e8f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '86c41e8f250899149c89693e1ad0f7dcf580bfd1':
  TelephonyManager.listen can have notifyNow always true.
  add ViewGroup's layoutMode attribute to public resources bug: 9359960