Merge "Fix javadoc for LocalSocket constructor" into main am: 9387c2d370 am: 913b4991c5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3266254

Change-Id: I9fb144dd678866c2ffc65c2da63bea04ece77a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>