Merge changes from topic 'am-3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp

* changes:
  ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b am: 1cc9ec47 am: 8965cd6a am: 47beaa8f am: 55c8a1ed am: 66a08a54 am: 7a063575 am: a07389b4 am: 5f4382e2 am: 3946a75c am: 3c529012 am: ce8a0dea am: 87cef51e
  system_server: add CAP_SYS_PTRACE am: 966619d0 am: b8d972e9 am: c46889e2 am: f5bd84b8 am: 982b8018 am: 7fd2d8ea am: 5bfe82c3 am: 12c5f0da am: dc87ac99 am: 02f0044d am: 6cadbad1 am: fdf1fdfc  -s ours am: ac9121b7