Merge cherrypicks of ['googleplex-android-review.googlesource.com/24366176'] into security-aosp-tm-release.

Change-Id: Iae6de741f974d3a401f1f463e6b657abc422a373
tree: 247d9ab7bc74e2466b01fce12c566f471d8b8100
  1. client/
  2. include/
  3. netutils_wrappers/
  4. server/
  5. tests/
  6. .editorconfig
  7. Android.bp
  8. NOTICE
  9. OWNERS
  10. PREUPLOAD.cfg
  11. TEST_MAPPING