Merge "Add test coverage for URLConnection.getFileNameMap()."
am: bc59463984

Change-Id: I6616a21332eef4af0230c5371ed2543b06e16ae7