Merge "Adding bt apex" am: 23a3442ab2

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1971824

Change-Id: Icb0bd52addd545879d716249ffcf6dbc38805c40