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

Change-Id: I5fb70c606842dd5af7fdb5506d7a0d14e83aeab9