am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev

* commit '7491d8769bdba72b071d7589420fff0158e95bd1':
  Cleanup NetworkCapabilities.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base