Merge changes from topics "bluetooth-localsocket-from-filedescriptor",...

Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3 am: 35dda704

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

Change-Id: I54af930f3570d738530d1020c94719b32139ae60