Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am: 040b774928

Change-Id: I0a05fdcd1d440f1ea686ddd0e6afd82daf33d1bb