Merge "Merge "Check mBtRouteProvider for null before using it" into rvc-dev am: e7647d94 am: 587127a3" into rvc-d1-dev-plus-aosp