Fix the last remaining gaps in our Java 6 API.
Fix the last remaining gaps in our Java 6 API.

See http://b/issue?id=2497395
See https://android-git.corp.google.com/g/64647

Change-Id: I0886e06163a3853bff69480b01e6e9f9f54fea4e

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