Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3d4

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

Change-Id: Ie6b65152b4ca222749a869349af848c12510c3c3