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

Change-Id: I7acad2715e98db930e7ec6b294682c6a8d56a537