Merge changes from topic "bt-androidx" am: c6a18e8fa7
am: 5cc9faa1a7

Change-Id: I3f547f2f6fae11672a378864e051a78e1b865bdd