Merge "Add a NET_CAPABILITY_FOREGROUND capability." into nyc-mr1-dev
am: 17a01a907e

Change-Id: I444b0f1143f3a389b469475ec639433720dd1443