Issue #28683: Merge 3.6.

diff --cc Lib/test/support/__init__.py
Simple merge

diff --cc Lib/test/test_socket.py
Simple merge

diff --cc Misc/NEWS
index 1c1ebdb04a0daac554be79f9bdfab0517c332a9b,35ad11ff507bd230d91a7807549235bdded77878..13f58e686a3d695317f29c56b7965885587b5aa5
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -598,24 -637,8 +598,27 @@@ Tools/Demo
  Tests
  -----
  
++- Issue #28683: Fix the tests that bind() a unix socket and raise
++  PermissionError on Android for a non-root user.
++
 + - Issue #26936: Fix the test_socket failures on Android - getservbyname(),
 +   getservbyport() and getaddrinfo() are broken on some Android API levels.
 +
 +- Issue #28666: Now test.support.rmtree is able to remove unwritable or
 +  unreadable directories.
 +
 +- Issue #23839: Various caches now are cleared before running every test file.
 +
 +- Issue #26944: Fix test_posix for Android where 'id -G' is entirely wrong or
 +  missing the effective gid.
 +
 +- Issue #28409: regrtest: fix the parser of command line arguments.
 +
  - Issue #28217: Adds _testconsole module to test console input.
  
 +- Issue #26939: Add the support.setswitchinterval() function to fix
 +  test_functools hanging on the Android armv7 qemu emulator.
 +
  
  What's New in Python 3.6.0 beta 1
  =================================