Merge "Fix NPE in URLClassLoader.getPermissions() introduced in Android N." am: 4fb1caa6dd
am: 7794ba179f

Change-Id: Ic61f330194974d8c9b8460fc9136d8747b6acb0c